more searchpath-related changes
3 files changed