Some small aws refinements.