Pull in mods namespace fixes