Fix more dumb shit