Fixing rake issues