Fix compile errors.

Excuse my reluctance to compile before pushing.