Assorted bookkeeping. Hopefully this doesn't break anything.