fixes for new versions of djinn