More import fixes.

I should really check stuff works before committing... :<