Clean up some property accesses
Fixed merge conflict?