terminal upgrade fixes