Merge: Bugfixes for MacOSX