Cluster Interface fixes for AWS. To be conntinued