fixed a couple of import bugs