Fixes on M