Minor audit improvements