copied some missing patches