fixes for VS2013