Minor updates

Change-Id: Ie6870bafa58b372644bc7379e91ab4c31ce0122c