Small changes for M1.