Small fixes for dist task