Fixes for new general identifier