Fixed some issues with the gems