Fix some FreeBSD/amd64 regressions.