minor fixes to 2.0a