Fixes in response to code review.