adding fixes to get semantics