Solution tweaks