Rake tasks fixed