Tweaks to handle missing TERM/binaries