more import fixes. Git is hard at first. :)