VE-1446 Fixes from testing