Fix compilation errors, ty @garyburd.