Fix More Avatar Displays