Please merge my changes upstream

These changes are vital (but insufficient) for cluster to work