Fix some wonky imports

I'm not sure why they broke, but I never liked them anyway.