Fixes for dists that include underscores