Reverted some bad changes
Revert some bad changes and add path improvements to Mac OS X version
Minor improvements
Fixed compilation issues
Path fixes for win32 solution