Some more fixes to the FreeBSD bootstrap