Some more FreeBSD fixes