Fixed rake bugs ++