Semantic check improvements