Fixed optional elements not being as optional as they should.