Port fixes from 3.0.

Missing messages.