Double logic tweaks