[es] Fixed semantics errors