more fixes

Change-Id: I5b08c3cb5aaa52594a76ba64b20fd3c9304f5877