Fix more 'x' buttons