Fixes to scaling font
Merged