Changed uid to string

Passes on my end. Will need to check on master before it's merged.