Fixed more character ID references