More gem tweaks