Fixed some warnings
Merge branch 'launcher'