Fix packaging bugs.