Fixed issues with rake