Bug Fixes + Cluster access