Small fixes to setting the ABI when doing freebsd upgrades