Adding pending changes for freebsd compilation.