Bit more house-keeping