Fixes for VS2013