Fix more things (to be squashed, too)