more fixes

Change-Id: Ie0ae0cb23109c9be20d0dca583f111d58db6725e