Fixes some imports for cl-tools