Minor messaging cleanups