Fixes to build.