QAART-273 fixes for log and verify