Make things work better at the terminal