Two minor improvements