Use bin-wrapper 3.0.0
Minor improvements