Robustness fixes for init
