Small macro changes