Console ouptut fixes. Resolves #1839 and  #1838