Fix merge problems that have wiped out getIndentity/setIndentity changes