Minor label adjustment and EmitAmount improvement