Fixes to get a build