f18d872 Fix more build errors

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