Small changes, getting ready for 2.2.0