Fix bootstrap; RM machines