Some more fixes on Character