Fixes to compile with source