Fixed some macro calls