Fixes for release version in VS 2013.