Fix rake tasks