[C74] fixing errors after rebase