more fixups

Change-Id: I6ff90141407301a5caa3218c7e39e49a7ec89627
more fix build errors

Change-Id: I333aa4851143f5026946e9077bc0b1f951d42c92