Fix robustness and tarballs