Fixed more references to characterID