Don't import M; fix build