Fix most of my recent damage