Some fixes to Identifier