SVY-6440 small fixes and output message