Replace a few unwrapped mgs1 calls