Fix character class bug/warnings
Merge pull request #146 from timcraft/fix-character-class-warnings

Fix character class bug/warnings