Fixed some macro types to be simply constants