Couple of tidyups