Re-commit some of the changes I made.