Fixes for disabling xmlsec