(no-ticket) Zeus fixes 3

Change-Id: Ied4e6d4529d00f605391857eb97d871ddaad9ebe
Merge "(no-ticket) Zeus fixes 3"