Merge in fixes for OpenBSD.