Character fixes
CB fixes