Fixed a few missed type changes causing complication errors in MSVC.