Tweaks for local init