Lots of minor fixes due to hazelcast api changes