Fixes to compile