Fixed search path issues