Openbsd test failures

The following set of diffs fixes all outstanding OpenBSD test failures in the open repo.

Everyone OK with this?