Tidy up a few details.