Minor formatting/platform tweaks.