Add and fix gems