Semantic fixes