more fixes

Change-Id: I01bd7f33d9d5431241d8b00e47f57a39abd018df