Fix more infinibooms.