Fixes for nunjuck suckery