Fix everything else too while I'm at it