* Fixed some of the public macros