Fixes for hazelcast 3