Apply CV changes to engine bridge; Fix build