More fixes to dist package generation.