Fix the build changes
Fix more OpenBSD issues