Change creator compare to string

Also fix missing self ref.