f18d872 Fix more build errors

Authored and Committed by michaelc 13 years ago
    Fix more build errors