[PATCH] Final FreeBSD compile fixups