FIX: Fix packaging