Fix odds and ends