More import mistakes.

I should do more testing while fixing things late at night...