Hand patches for 3.0.47