Fixed some bugs with macro overloading