Fix source tree