diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 50627155f..4cbfe90ac 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -135,7 +135,7 @@ bool bitmap_save(void *bitmap, const char *path, unsigned flags)
 	{
 		if(fh = Open(path,MODE_NEWFILE))
 		{
-			DoDTMethod(dto,NULL,NULL,DTM_WRITE,fh,0,NULL);
+			DoDTMethod(dto,NULL,NULL,DTM_WRITE,NULL,fh,DTWM_IFF,NULL);
 			Close(fh);
 		}
 
@@ -286,8 +286,8 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap)
 		}
 
 		SetDTAttrs(dto,NULL,NULL,
-					DTA_ObjName,bitmap->title,
-					DTA_ObjAnnotation,bitmap->url,
+					DTA_ObjName,bitmap->url,
+					DTA_ObjAnnotation,bitmap->title,
 					DTA_ObjAuthor,messages_get("NetSurf"),
 					DTA_NominalHoriz,bitmap_get_width(bitmap),
 					DTA_NominalVert,bitmap_get_height(bitmap),
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index 94457f40a..51b8e3100 100755
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -31,16 +31,7 @@
 #include <proto/datatypes.h>
 #include "amiga/bitmap.h"
 
-#ifndef ID_AUTH
-#define ID_AUTH MAKE_ID('A','U','T','H')
-#endif
-
-#ifndef ID_ANNO
-#define ID_ANNO MAKE_ID('A','N','N','O')
-#endif
-
 struct IFFHandle *iffh = NULL;
-const char * const netsurf_version;
 
 void ami_clipboard_init(void)
 {