Fixes for building with 2014r3.