- Improved handling of magic files