Merge branch 'warning-cleanup'