Fixes to build on 10