COMP: More ZeroValue fixes

Change-Id: I2976f339356674c1e89ec1795d96f81b0328a68c