Fixes to constant generataion.