WIP: Minor changes before release of 2.1.0