fixups from bakins for ridley bailing on not found