Fix packaging bugs