Got rid of some macro compile-time warnings