Fixed compile errors from bad commits.