Fixes for VC++14.