Merge pull request #1068 from dottedmag/bugfixes-osx

Bugfixes osx