Fixed some more import problems