Committing a variety of bug fixes.