Re-add missed patches