Still fixing gem issues