fixes a couple of import problems