Further logic tweaks