[3.8] Multiple fixes