Fixed some issues with terminal setup
.