Fix for lots of Undertow issues