Merge pull request #1326 from 0-wiz-0/master

Two fixes for NetBSD