Small changes to make it better in VS2013