some more fixes

Change-Id: I3107f1955f84a0df859ec9afd306c1cc676748bf