diff --git a/src/Text3.cpp b/src/Text3.cpp
index da7b62a95b..4f5d3dcf42 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1675,7 +1675,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			setLayout(cur, tclass.defaultLayoutName());
 			ParagraphParameters p;
 			setParagraphs(cur, p);
-			insertInset(cur, new InsetFloatList(to_utf8(cmd.argument())));
+			// FIXME This should be simplified when InsetFloatList takes a 
+			// Buffer in its constructor.
+			InsetFloatList * ifl = new InsetFloatList(to_utf8(cmd.argument()));
+			ifl->setBuffer(bv->buffer());
+			insertInset(cur, ifl);
 			cur.posForward();
 		} else {
 			lyxerr << "Non-existent float type: "
diff --git a/src/frontends/qt4/ButtonPolicy.cpp b/src/frontends/qt4/ButtonPolicy.cpp
index e2a3431b67..463c1611ea 100644
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -389,6 +389,7 @@ void ButtonPolicy::initNoRepeatedApplyReadOnly()
 	state_machine_[VALID][SMI_READ_ONLY] = RO_VALID;
 	// State::INVALID
 	state_machine_[INVALID][SMI_INVALID] = INVALID;
+	state_machine_[INVALID][SMI_OKAY] = INVALID;
 	state_machine_[INVALID][SMI_READ_WRITE] = INVALID;
 	state_machine_[INVALID][SMI_VALID] = VALID;
 	state_machine_[INVALID][SMI_RESTORE] = INITIAL;