Fixup rake tasks