Fast patches for 1.7.10