Rake task modifications
Small rake task modifications