fix: unify changes for HAVE_RING and HAVE_PLURAL