Fix solution

Fix #46353; #46372; #46370; #46368; #46367 and others

Test plan: Check that answers really are accepted.

Auditors: eater