Better init sequencing and minor fixes
Merged sequencing fix