More terminal fixups.