Fixed Mac and Win support. I hate you, Mac and Win.