fixes for p2.4