Hand patches needed for 3.0.40