More OpenBSD fixes and other clean up