Key loading improved.