VE-847: Fixes from code review