Fix a few bad imports