Fix messages on AP