Some more manual type deductions for msvc