fa03f8a Fix several issues raise during patch review.

Authored and Committed by James Laska 13 years ago
    Fix several issues raise during patch review.