Fixed customer annotations