Added missing import
Fix remaining failures in building docs