diff --git a/src/eepp/math/interpolation1d.cpp b/src/eepp/math/interpolation1d.cpp
index fd664f809..3aa512de1 100644
--- a/src/eepp/math/interpolation1d.cpp
+++ b/src/eepp/math/interpolation1d.cpp
@@ -67,6 +67,7 @@ Interpolation1d &Interpolation1d::wait( const Float& pos, const Time& time ) {
 
 Interpolation1d &Interpolation1d::waitAndAdd(const EE::Float & pos, const EE::System::Time & waitTime, const EE::System::Time & addTime) {
 	add( pos, waitTime ).add( pos, addTime );
+	return *this;
 }
 
 Interpolation1d & Interpolation1d::reset() {
diff --git a/src/eepp/ui/uicontrol.cpp b/src/eepp/ui/uicontrol.cpp
index 7c5b0e7e6..42a3cbfbf 100644
--- a/src/eepp/ui/uicontrol.cpp
+++ b/src/eepp/ui/uicontrol.cpp
@@ -1656,7 +1656,7 @@ UIWindow * UIControl::getParentWindow() {
 }
 
 bool UIControl::isReverseDraw() const {
-	return mControlFlags & UI_CTRL_FLAG_REVERSE_DRAW;
+	return 0 != ( mControlFlags & UI_CTRL_FLAG_REVERSE_DRAW );
 }
 
 void UIControl::setReverseDraw( bool reverseDraw ) {
diff --git a/src/examples/fonts/fonts.cpp b/src/examples/fonts/fonts.cpp
index e074e44e1..4ca3ef31e 100644
--- a/src/examples/fonts/fonts.cpp
+++ b/src/examples/fonts/fonts.cpp
@@ -61,9 +61,9 @@ EE_MAIN_FUNC int main (int argc, char * argv []) {
 
 		// Set the font color to a substring of the text
 		// Create a gradient
-		size_t size = Txt.size();
+		int size = (int)Txt.size();
 
-		for ( size_t i = 0; i < size; i++ ) {
+		for ( int i = 0; i < size; i++ ) {
 			text.setFillColor( Color(255*i/size,0,0,255), i, i+1 );
 		}