Small change in emitted messages.
Small fixes