Add some housekeeping-related things