Fix warnings.
Fix for MODCLUSTER-391 related problems.
Merge pull request #63 from jfclere/1.2.x

Fix for MOD_CLUSTER-391