Fix some minor Undertow issues