Fixed issue with Cluster.findContainer. Probably need automated testing around this.