compilation error fixes after merge with not correct master.