Minor metadata cleanup for providers