Fixes for dist.