Fix leftover mistakes from large edit