More fixes in preparation for releasing 2.0