Bug fixing on tree farm