Minor message clean up