Fix MSC16 compiler errors