Cosmetic changes to include search path