Minor fixes suggested by @tshepang and @mmerickel thanks!