Improved setup for dist