Various fixes to start building a character correctly