Fix things, break other things