Buildfix for upstream MG