Several updates

Change-Id: Ic9bdc39505ebd266babe1b35674954bd523d9274