more targets moved to gbuild