Fixes to get it building