General updates in preparation for 2.0.0