Some Undertow fixes