small fixes

Change-Id: I9455554dcb16dc21c912a7575400ababb11bfd56