diff --git a/doomsday/apps/client/src/busyrunner.cpp b/doomsday/apps/client/src/busyrunner.cpp
index 6e61a3e1f7..9b77128fea 100644
--- a/doomsday/apps/client/src/busyrunner.cpp
+++ b/doomsday/apps/client/src/busyrunner.cpp
@@ -236,12 +236,12 @@ BusyRunner::Result BusyRunner::runTask(BusyTask *task)
      * event loop used during busy mode. Toggling the swap interval off and
      * back on appears to be a valid workaround.
      */
-    Loop::timer(0.1, [] () {
+    Loop::timer(0.1, []() {
         ClientWindow::main().glActivate();
         GLInfo::setSwapInterval(0);
         ClientWindow::main().glDone();
     });
-    Loop::timer(0.5, [] () {
+    Loop::timer(0.5, []() {
         ClientWindow::main().glActivate();
         if (Config::get().getb("window.main.vsync")) {
             GLInfo::setSwapInterval(1);
diff --git a/doomsday/apps/client/src/ui/clientwindow.cpp b/doomsday/apps/client/src/ui/clientwindow.cpp
index e04b9a83e1..0add8dd8bc 100644
--- a/doomsday/apps/client/src/ui/clientwindow.cpp
+++ b/doomsday/apps/client/src/ui/clientwindow.cpp
@@ -562,7 +562,7 @@ DE_PIMPL(ClientWindow)
     {
 //        Mouse_Trap(state == MouseEventSource::Trapped);
 
-        DE_ASSERT_FAIL("Change mouse state with SDL?");
+//        DE_ASSERT_FAIL("Change mouse state with SDL?");
     }
 
     /**
diff --git a/doomsday/apps/plugins/common/src/menu/widgets/widget.cpp b/doomsday/apps/plugins/common/src/menu/widgets/widget.cpp
index a0e4ee94ea..b435004e5c 100644
--- a/doomsday/apps/plugins/common/src/menu/widgets/widget.cpp
+++ b/doomsday/apps/plugins/common/src/menu/widgets/widget.cpp
@@ -19,6 +19,7 @@
  */
 
 #include <de/Map>
+#include <de/NoneValue>
 #include "common.h"
 #include "menu/widgets/widget.h"
 #include "menu/page.h"
@@ -289,6 +290,7 @@ Widget &Widget::setUserValue(const Value &newValue)
 
 const Value &Widget::userValue() const
 {
+    if (!d->userValue) d->userValue.reset(new NoneValue);
     return *d->userValue;
 }
 
@@ -300,6 +302,7 @@ Widget &Widget::setUserValue2(const Value &newValue)
 
 const Value &Widget::userValue2() const
 {
+    if (!d->userValue2) d->userValue2.reset(new NoneValue);
     return *d->userValue2;
 }