fix builder macros