[m] minor file changes to clean up build