Fixed some of the affix issues