Tweaks for terminal