Small changes to clean and master scripts.