More unifier tweaks to try to get it to work