Limited use of gems

Other EverMerge issues: