diff --git a/CHANGES b/CHANGES
index 9c9726b3..815e28dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+20/03/2006
+SPoG
+- Fixed crash when resetting preferences after startup failure.
+- Fixed crash on next-leak-spot with build-monitoring enabled.
+
 20/03/2006
 SPoG
 - Changed Copy/Paste to work on face textures if any faces are selected.
diff --git a/TODO b/TODO
index fc2565e3..bb6c0e22 100644
--- a/TODO
+++ b/TODO
@@ -11,7 +11,8 @@ HalfLife: half-life maps saved in q1 map format are not supported - currently ha
 Entity: creating a new entity with all the brushes of another entity selected results in the latter entity having no brushes.
 SConscript: build fails if SETUP=1
 Brush: non-BP auto-texture-fit fails when rotation is 90
-GUII: can't use arrow keys to navigate in camera view when capslock is enabled
+GUI: can't use arrow keys to navigate in camera view when capslock is enabled
+GUI: screensaver causes: gdkgc-win32.c: line 905 (gdk_win32_hdc_get): assertion failed: (win32_gc->hdc == NULL)
 
 
 FEATURES
diff --git a/radiant/main.cpp b/radiant/main.cpp
index c9a50833..dc764663 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -550,9 +550,9 @@ int main (int argc, char* argv[])
   
   remove_global_pid();
 
-  create_local_pid();
+  g_Preferences.Init(); // must occur before create_local_pid() to allow preferences to be reset
 
-  g_Preferences.Init();
+  create_local_pid();
 
   // in a very particular post-.pid startup
   // we may have the console turned on and want to keep it that way
diff --git a/radiant/points.cpp b/radiant/points.cpp
index 0f50ebdf..b93e4278 100644
--- a/radiant/points.cpp
+++ b/radiant/points.cpp
@@ -391,6 +391,7 @@ void CPointfile::saxEndElement (message_info_t *ctx, const xmlChar *name)
     // we are done
     GenerateDisplayList();
     SceneChangeNotify();
+    s_check_point = begin();
   }
   else if(string_equal(reinterpret_cast<const char*>(name), "point"))
   {