Tweaks for garage code