Fixed rake issues