Minor tidyups