Fix everything else