Tweaks for more minimal setup