Fix macros to add ;