Fixed references due property-keys issues