Fix initialization for before tools