A few more changes to v2.0.0