Fixed %setup / %configure mixup, more