last fixes in 2.4