ProGen fixes for VS2010-2013