More fixes to share tools