Fix some warning and errors for MSC16