minor changes for vs2012 and windows8