Minor error messages cleanup