further fixes for gluon builder