Fixed character creation bugs after last commit - fixes #2