fix imports to work with github.com/marben/