Fixed some gem issues