VE-1290 Fixes from CR comments