[es] Fixed semantics errors
Merge branch 'BrodaNoel-semanticerrors'