bugfixes for identity file