Tweaks to solution rearrangement