Minor improvements to all bin scripts