VE-526 / VE-1458 Changes from code review