2.0 -> 2.4 last fixes