Fixed default file types, etc.