few tweaks so that undertow pass the testsuite