Fixes for init
Fixes for init