Several default macros fixed