Housekeeping for v7.5