Fixed semantic checks