Minor macro fixups