huon patch with fixups