Fix more cases where type & index aren't gint but still guint