Four small tidyups

Thanks, Mike