Merge pull request #489 from kholia/FreeBSD10-fixes

tweaks required for building on FreeBSD 10 (32-bit)