diff --git a/src/WordList.cpp b/src/WordList.cpp
index 1423f83c9d..c5fef21167 100644
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -77,4 +77,4 @@ void WordList::insert(docstring const & w)
 }
 
 	
-} // namespace lyx
\ No newline at end of file
+} // namespace lyx
diff --git a/src/WordList.h b/src/WordList.h
index b802cf098f..263c4d40da 100644
--- a/src/WordList.h
+++ b/src/WordList.h
@@ -31,7 +31,7 @@ public:
 	void insert(docstring const & w);
 
 private:
-	class Impl;
+	struct Impl;
 	Impl * d;
 };
 
diff --git a/src/rowpainter.cpp b/src/rowpainter.cpp
index e4e48d6c52..7c9ea8a022 100644
--- a/src/rowpainter.cpp
+++ b/src/rowpainter.cpp
@@ -827,13 +827,13 @@ void RowPainter::paintInlineCompletion(Font const & font)
 	
 	if (s1.size() > 0) {
 		f.setColor(Color_inlinecompletion);
-		pi_.pain.text(x_, yo_, s1, f);
+		pi_.pain.text(int(x_), yo_, s1, f);
 		x_ += theFontMetrics(font).width(s1);
 	}
 	
 	if (s2.size() > 0) {
 		f.setColor(Color_nonunique_inlinecompletion);
-		pi_.pain.text(x_, yo_, s2, f);
+		pi_.pain.text(int(x_), yo_, s2, f);
 		x_ += theFontMetrics(font).width(s2);
 	}
 }