misc aws cluster changes

fix aws specific issues.