Adjust math macros to avoid possible issues