Documentation related fixes