Fix dist and packaging