Fixed some warnings
Merge branch 'master' into JesseMOE