Deal with cross-platform issues and tests a bit better.