Clean up some warnings

This makes the build output length drops from 1500 lines to 300 in MSVC