Fix more conflicts between Halo and MultiWindow