Fix packaging again