SemanticCheck minor changes