Various bugfixes to the identification framework.