Exportbuilder: still some bugs