Solutions tweaks