Fix pre-gemification references