[Bug 139350] emu-tools-0.9.4-562: two buglets