Fixes for init