fixed some affix issues.