VAT-388 some minor changes for code