Fix packaging issues