Completed 3.4.0 version w/out OpenBSD portability