more gem fixs