Fix broken validations on incoming messages