Fixed #define vars