MSVC working

Couple more changes that #$@%# MSVC needed because it requires things
overloaded in idiotic ways.