Fix imports

Fix imports broken in #367.