Small tidyups