Changes suggested during hazelcast code review