minor updates

Change-Id: I1b03a3dab71b4f693d7e8f062723f02ec5009e87