Re-apply useful changes