WIP - Fix rake tasks