Interactive fixes and updates

Change-Id: Ia2c5d203b949d8d682df5de372e9f617087bd0ee