Fixed a few improper macro usages