Doc warning cleanup