Fix affix offsets