Fix more all-in bugs