Fix some inits