fuji/legacy: some fixups