Fix compiler issues reported by Xdacted.

/cc @keithduncan