more fixes to rake task