fixups for manual mapping