Minor changes suggested by @cdeil