Fixes to the init