Logic tweaks