fixes for visual studio 2013