various fixes for dh-exec