Housekeeping and performance enhancements