Fixing package setup