fix few issue on the emission model elaboration