fix few minor issue in the emission model elaboration