more fixes for 2.1.0