wonky affix fixes