Minor fixes on output messages