VE-526 / VE-1458 Fixes and additions from CR feedback