more VS2012 L4 warning fixes