Tweaks to CFF table