Some more small fixes regarding deployment of machines