optimizations
fix one thing that makes clang scream
Merge branch 'master' into mac