Final logic tweaks