Fix for some affix jumpyness issues wip