Fix/lookup failures