Minor tweaks
Initial work on configurable Hazelcast version