Update to fix some issues on Apple