Apply vanilla 3.8.1 patches