fixing message references.