Fixing up odds and ends