More identifier fixes