Fixes from "impoetk"