Small changes for bookkeeping