Fix paths, real lookup