Fix gem issues