Nits and fixes