Clean up some warnings

Make output length drops from 1500 to 300 in MSVC