Fix up some Undertow subsystem issues