fixes from cherry pick for glow scale etc.

Signed-off-by: travp624 <travp624@gmail.com>