Cleaning up odds and ends.