Fix some solutions