More changes to match legacy BASH with new BASH