Hinting fixes