Fixing m4 stuff