- Fix a couple of issues on bsd (likely on linux too).