Cleanup : fixed some VS2012 warnings

- now compiles fine with VS2012