Fix generator and tools