Latest update

Fixes after clean build test