more fixes

Change-Id: Iefd05bbc3924e88f10cc349a61f6d5266579269c