Added support for FreeBsd file naming.
Minor fixes.