fix #define's