Fix to machine list, exporting