Some debugging, better handling of constants with some generators