Minor import fixes.