Identity Key Util bug fixes