Fix 1.0 issues, merge Safari schema export fix