More fixes for the packaging