Fix a few missed imports