metadata fixes around last committed fixups