Fixed a couple of bugs in character loading