OSX-ified all my ish