fixes for 3.0