Two improvements for FieldAccessingSolutionCloner