Added patches for R8d