Reapply sem. annotation changes