Observation based fixes