Tweak rake tasks