fixes for 2.0