Thanks @racb - I have appended a commit, that I think should address your comments. -- https://code.launchpad.net/~adam-retter/uvtool/+git/uvtool/+merge/457345 Your team Ubuntu Sponsors is requested to review the proposed merge of ~adam-retter/uvtool:emu-riscv64 into uvtool:main.