gems fixes