fixes for 2.4