A few minor tweaks.

Next up will be GetSysInfo(), which may have to be done tomorrow.