Some minor fixes
Hapi 3.x/4.x compatibility