VE-739 Fixes and optimizations