Fix several occurances of missed diff between the current version of mc-dev.