Data audit fixes