Some house keeping