Merge branch 'fix-warnings'