Minor import fixes