Minor import cleanups