KAZOO-2077: fix macros