Fix small compatability with Cluster directory