More init tweaks