Small fixes for VS2013