Fix pi factors on emission