More FreeBSD/Darwin changes