Fixes for broken VS2013 compiler.