More 3.4.18 changes