Fixes to allow building