Fixes to the font setting business
Merge pull request #4 from pjrobertson/master

Fixes to the font setting business