Bring in some miscellaneous changes from OpenBSD and point to an