Fixes in response to Will's comments.