Resolve import warnings on vanilla TC gibs Mark gibs as R/W and convert vanilla TC gibs to use primitives