Tidy up several details.