Merge branch 'ab/bsd-fixes'