More changes to machine imaging