Fixes in Element and ElementContainer