Fixes for fonts