Machine fixes