Sysadmin windows cleanups

Minor tweaks. I'll open a separate PR for the Linux versions in case it turns into a mass debate.