Improves Mac support