CA fixes for Narvalo.Build