Finally used pycharm to fix some more imports