Fixes for message queue to improve output consistency and to prevent error messages bahaving as static messages.