Update to avoid Non UTF-8 chars.
Update for CB 1.7.10

Some minor changes / fixes