Scripts/HoR: Some fixups.