Terminal info and other small changes needed adjusting for Solaris