Fixes to definition macros