fix some wonky import problems