Some minor fixes
Fix osx disables to work correctly