FreeBSD fixes, closes #3