few more type fixes

Change-Id: I6b953a6792c8c72c29dc0e7b25bdae41da50ca6d