fixes to 2.4