more fixes to 2.0