Fix more dumb bugs