Fixing Archive and few little stuff