more BSD changes