Fixes for SAX exceptions and bad MachineImages