more fixups regarding FreeBSD support