Fix some warnings.
Merge branch 'master' into macos-build