Fix some bugs with the identification storage implementation.