Merge fixes from wtsi-npg devel