Minor fixes to constant emission