Minor update. Mainly portability fixes not affecting FreeBSD.
State Changed From-To: open->closed Committed, thanks!