@sharkee -
1. I imported the entire baseline, but when I did the comparison, I filtered out the Server-only settings from the results. Effect should be the same either way.
2. No - everything was applied, except for the adjustments that the non-domain-joined option does.

Can you verify that when you extracted the baseline that you didn't have any "path too long" errors that interfered with successful extraction from the zip? The paths in the zip file are VERY long.