(OSX) Some logic fixups