Code review fixes for properties driver.