Tweaks for basic terminals