More changes to rake