And fix a couple of things to adapt to latest release. Change-Id: I1cf2dadcfa66975f7f5020ca97a75ebf7b055d4a