(no-ticket) Fix bugs when anonymous/model_solution

Change-Id: I63c65c6bec48b9d13d7924e35c10e8f3c893d500