Fixed gem issues