More unix clean-ups