[PATCH 2/4] Machine: deconfiguration fixes