More emit changes