minor fixes on way to 2.0.