Bugfixes in new entity activation logica