Changes to make build work with VS2013