Fixes for MSVC compiler errors/warnings.  Linker issues remain.