Update to newer FJ-Tools branch