Increase Mac compatibility, might actually work now. Testing needed...