Fix more GUI types