Fixups

Change-Id: I6f17c43b09b312f23798416de4e8e9600ff4ef0a