Fixed first half of the Character Portrait issues