Other modifications on the hazelcast stuff