Cap and gems
fixes