Fixes for VS2014