Bug fix: some elements where treated as OPTIONAL when they shouldn't.