More nits and fixes