The first I utterly agree with, the second I fear may be a pointless exercise.
It's very simple, actually. Increase the amount going into the trust fund while simultaneously decreasing the amount going out. It is politically difficult to do, of course, but there is no doubt it would work.