some Hapi fixes

Some hapi fixes