Font fixes and cleanup