Fixed some slips (VS2012 compile errors)