fixes for output messages