with-transform wrapper + some other fixes