Fix rake and other things.
Merge branch 'hotfix/fix-rake'