Moved Mac-specific code aside