Fixed things, broke other things