minor 2.4 patch edits

Signed-off-by: Sam Kleinman <samk@10gen.com>