Fixes. Enhanced Solution.ck handling.