Font fixes, migration from v2