Fixes for OS X, the ModuleManager sources and some typos. #2

Merged
merged 3 commits into from Mar 21, 2012