fix up packaging