Collapse fixes and affix fixes