Additional fixes for FreeBSD-10 build: