Stability fixes

Fixes various parsing issues in the Identify routines that cause crashes in the module.