COMP: More ZeroValue fixes

Change-Id: I94a213d9610d11f12796f7c07ca6e9eabfb4bb06