Commit 8: Corrections (missing refs to Gems)