Better machine creation handling