Fixed Windows goofy macros