Fix for BS tools

Running on margerite.