More changes to accommodate the broken pdksh shell