Finish off some odds and ends