MSVC level 4 warning fixes

These changes fix two level 4 warnings issued by MSVC 12.0.