Character Builder - Misc additions