[ENGOPS-438] - Several fixes for release build