Reduce questionability of some properties

Change-Id: I2dd53915418b05a3ecbec46209a44f0fd1c5f0c4