Minor import re-ordering