Fixing things.

(And breaking other things)