even more fixes

Change-Id: I52938f63d0bcbef04fe16d32417dd92ec331ff35