More search path bug fixes.