Make some tweaks to how init works