Two minor fixes