housekeeping and warning fixing