fixes to get the revamp macro right