Emission fixes

I did *not* run the tests this time due to issues. Could someone verify the changes for me? Also de0ab72 should maybe go into 2.064 too...