Merge in a number of fixes for OpenBSD.