Fix message pump errors