Removed assumptions on search paths.