More macros and fixes