Fixed gems issues