Fix some bugs in the CIQ Identity Extension