A few minor backports for holideck to work with iotas correctly