Combo and it finally worked. The updater has been flaky since the Mavericks update. I need to wipe the laptop and do a fresh install.