Fix more oddities