Fix activation

Fixes more side effects of the identify order fix.