A few init tweaks