Fixes for VS 2013