Fix Build & one NPE in undertow