5.5.x : Avoid more leaks