minor patches for the real thing.