Computed property fixes