Fixes to build