Add Tombfix's patches