#168 fix-up imports