Clean up a few odds and ends.