Tidy up for 2.10 release