Small changes resulting from reviewing the connection classes.