sync mgw fixes