A couple of tweaks for issues found when testing on Linux