Fixups from porting the finance app.