Minor gem fixes