A few updates

Change-Id: Ia49fdfe755a97472e14371df3b324341602acd64