diff --git a/Nasal/contrail.nas b/Nasal/contrail.nas
index 167759324..3ae2fcb41 100644
--- a/Nasal/contrail.nas
+++ b/Nasal/contrail.nas
@@ -26,7 +26,7 @@ updateContrail = func{
 
 ### Contrail
 
-print ("init contrail");
+printlog ("debug", "init contrail");
 _setlistener("/sim/signals/nasal-dir-initialized", func {
     props.globals.initNode("environment/pressure-inhg", 1, "DOUBLE");
     props.globals.initNode("environment/temperature-degc", 1, "DOUBLE");
diff --git a/Nasal/seaport.nas b/Nasal/seaport.nas
index 5d9cb7fdb..f496b6ecb 100644
--- a/Nasal/seaport.nas
+++ b/Nasal/seaport.nas
@@ -1,5 +1,5 @@
 _setlistener("/sim/presets/latitude-deg", func {
-	print("*** NEW LOCATION ***");
+	printlog("info", "*** NEW LOCATION ***");
 	settimer(func {
 		var typ = getprop("/sim/type");
 		var lat = getprop("/position/latitude-deg");
diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml
index 63e104414..4e2fa953a 100644
--- a/gui/dialogs/location-in-air.xml
+++ b/gui/dialogs/location-in-air.xml
@@ -260,6 +260,8 @@
       <binding>
         <command>nasal</command>
         <script>
+          setprop("/sim/presets/parkpos", "");
+            
           if (!mode.airport.getBoolValue()) {
             setprop("/sim/presets/airport-id", "");
             setprop("/sim/presets/runway", "");
diff --git a/materials.xml b/materials.xml
index 5f990123f..e3f79bf99 100644
--- a/materials.xml
+++ b/materials.xml
@@ -1313,9 +1313,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -1376,9 +1376,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -1437,9 +1437,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -2133,9 +2133,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -2195,9 +2195,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>
@@ -2257,9 +2257,9 @@ Shared parameters for various materials.
     <path>Models/Buildings/red-barn.ac</path>
     <path>Models/Buildings/horse-stable.ac</path>
     <path>Models/Buildings/cow-stable.ac</path>
-    <path>Models/Buildings/farmhouse1.ac</path>
-    <path>Models/Buildings/farmhouse2.ac</path>
-    <path>Models/Buildings/farmhouse3.ac</path>
+    <path>Models/Agriculture/farmhouse1.ac</path>
+    <path>Models/Agriculture/farmhouse2.ac</path>
+    <path>Models/Agriculture/farmhouse3.ac</path>
     <coverage-m2>750000</coverage-m2>
     <heading-type>random</heading-type>
    </object>