diff --git a/amiga/login.c b/amiga/login.c
index 35115bc2a..fc8dbf575 100755
--- a/amiga/login.c
+++ b/amiga/login.c
@@ -106,7 +106,7 @@ void gui_401login_open(nsurl *url, const char *realm,
          	WINDOW_Position, WPOS_CENTERSCREEN,
            	WINDOW_ParentGroup, lw->objects[GID_MAIN] = VGroupObject,
 				LAYOUT_AddChild, StringObject,
-					STRINGA_TextVal,lw->lwc_string_data(host),
+					lwc_string_data(STRINGA_TextVal,lw->host),
 					GA_ReadOnly,TRUE,
 				StringEnd,
 				CHILD_Label, LabelObject,
diff --git a/amiga/tree.c b/amiga/tree.c
index da7e303bb..f2ef3cc83 100755
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -283,10 +283,14 @@ void ami_tree_drag_icon_show(struct treeview_window *twin)
 	{
 		if(node && (url = tree_url_node_get_url(node)))
 		{
-			if(data = urldb_get_url_data(url))
+			nsurl *nsurl;
+			if (nsurl_create(url, &nsurl) != NSERROR_OK)
+				return;
+			if(data = urldb_get_url_data(nsurl))
 			{
 				type = ami_content_type_to_file_type(data->type);
 			}
+			nsurl_unref(nsurl);
 		}
 		ami_drag_icon_show(twin->win, type);
 	}