Fix affix issues