e8635c more build fixes1

Authored and Committed by mclasen 11 years ago
    more build fixes1