Gemify and other fixes