Fix more corner cases