Update status messages. See #88 and #87