Cleanup odds and ends.