Rake file updates into something more sensible
More rake updates