Fix first message checker issues