Cleanup leftovers from VS2010 and fixed compilation.