Some more solution tweeks