Fixed system properties

Change-Id: I2cf33d9c5ff5962f17bd20865216ab73197f50ec