Small fixes

Missing subtypes, parantheses and duplicate UID fix