Re-instate some missing imports