Fixing some issues with the gem